Summary

This PR introduces an automated workflow that labels pull requests with merge conflicts using eps1lon/actions-label-merge-conflict.

When a PR has merge conflicts:

• A label “PR has merge conflicts” is automatically added.
• A comment is posted notifying the contributor.
• The label is automatically removed once conflicts are resolved.

Why This Change?

Currently, maintainers must manually identify and notify contributors when their PR requires rebasing. This creates unnecessary review overhead and delays.

This workflow:

• Improves PR triage visibility
• Notifies contributors immediately when conflicts arise
• Reduces manual maintainer intervention
• Ensures PRs are conflict-free before review

Behavior

When merge conflicts appear:

• Label added: PR has merge conflicts
• Comment posted:

⚠️ This PR has merge conflicts.
Please resolve the merge conflicts before review.
Your PR will only be reviewed by a maintainer after all conflicts have been resolved.
Watch this video to understand why conflicts occur and how to resolve them.

When conflicts are resolved:

• Label is automatically removed.

Testing

The full lifecycle was tested in an isolated test repository:

• Conflict created → label + comment added
• Conflict resolved → label removed
• Subsequent base merges → re-check works correctly

Screenshots

Checklist

• My code follows the project's code style and conventions
• I have made corresponding changes to the documentation
• My changes generate no new warnings or errors
• I have joined the Discord server and I will share a link to this PR with the project maintainers there
• I have read the Contributing Guidelines

⚠️ AI Notice - Important!

We encourage contributors to use AI tools responsibly when creating Pull Requests. While AI can be a valuable aid, it is essential to ensure that your contributions meet the task requirements, build successfully, include relevant tests, and pass all linters. Submissions that do not meet these standards may be closed without warning to maintain the quality and integrity of the project. Please take the time to understand the changes you are proposing and their impact.